Rohit : Cleaned up folder strucutre