Colors are now nicely formatted
File reorganization