Re-organizing files and cleanup