First listing code, more to come
Code cleanup, some new things introduced - mostly layout changes
Removed unneeded files