Redistribution of directories to make it work as a library
minor format changes
minor format changes