Moved all resources to nested dirs