Remove: Un-needed files
Add: extra init files
Code clean up