Reverted folders from src/include to src