Add some comments and included files
Clean up dir