Final commit before revert

cause : new directory structure makes everything complex