Changed structure
Added missing folders and files