Import existing code and organize