Reorganize all teh things

* Use A3000 instead of a3 wherever appropiate
* Cleanup
* Some fixes

Change-Id: Ib6438a58cc6e9d69699218ae419d0af3ba1777d5