Re-structured files to base on Symfony2