diff --git a/TODO b/TODO
index da831d5d..959b3f26 100644
--- a/TODO
+++ b/TODO
@@ -38,33 +38,15 @@ Legend:
  + Package/Files
 
 2. Alpha
- - incremental build (meren)
-   - generate binary release number by comparing MD5s (meren)
-   - keep track of successfully completed configure, make, install
-     steps (necessary for large-scale builds?) (meren)
- / multi-package dependency analysis (eray)
-   + design a package operation planner
-   / install operation (eray)
-   - upgrade operation (eray)
- + command line interface:
-   + pisi remove
-   - pisi upgrade (eray)
-   + svn-like CLI
- - non-interactive use (baris)
- / configuration file
-   + define the format of the configuration file
-   + extend Config module (config.py) accordingly
-   - define configuration keys (baris - meren)
  / component/category
    + requirements
    - xml format (baris) (bunlarin class'leri yazilmali)
    - usage (build process'in icine koymak baris - meren)
- / query
-   + list of installed packages (eray)
-   - comar OM information (Provides) (baris)
- - refactor actionsAPI (caglar)
+ + query
+   - comar OM information (Provides)
+   - package by name, summary/description
  - actionsAPI documentation (caglar)
- / versioning information document (bunu eray'in yazdigi mail'den bakin!)
+ / versioning information document
  / verify metodlari
    + SpecFile
    + MetaData
@@ -74,6 +56,24 @@ Legend:
    + sourcedb
    - package (baris)
    + configuration file (baris)
+ - non-interactive use (baris)
+ - incremental build (meren)
+   - generate binary release number by comparing MD5s (meren)
+   - keep track of successfully completed configure, make, install
+     steps (necessary for large-scale builds?) (meren)
+ + multi-package dependency analysis (eray)
+   + design a package operation planner
+   + install/remove operations (eray)
+ + command line interface:
+   + pisi remove
+   + svn-like CLI
+ / configuration file
+   + define the format of the configuration file
+   + extend Config module (config.py) accordingly
+   - define configuration keys (baris - meren)
+ + query
+   + list of installed packages (eray)
+ + refactor actionsAPI (caglar)
  + fix xml indentation (meren)
  + define file types (doc, executable, conf, etc...) (baris - meren)
  + write specfile (eray)
@@ -96,11 +96,12 @@ Legend:
 
 3. Beta
 
+ - upgrade operation (eray)
  - system-wide upgrade (upgrade-all) komutu (eray)
  / multiple package repository (eray)
    + decide how to implement
    / make a package and sourcedb for each repo
-   - support medium types
+   - support medium types :( uhuuuu
      - internet: http/ftp
      - local repository
      - cdrom dvd
@@ -115,14 +116,15 @@ Legend:
  - exception handling (baris)
  - incremental build/fetch for repository index (pisi-index.xml)
    - diffsets (caglar)
+
+4. Release (bug fix, guzellestirme vs.)
+
+ - file locking hikayesi database'lerde guzel calisiyor mu (eray)
+
+5. Post Release
+
+ - transaction stuff for database (eray)
  - multi-architecture support (baris, caglar)
    / design decisions
    / extend XML specs to support that
    - cross-platform building support
-
-4. Release (bug fix, guzellestirme vs.)
-
-   - file locking hikayesi database'lerde guzel calisiyor mu (eray)
-
-5. Post Release
-   - transaction stuff for database (eray)