Changed structure to comply with src structure