Clean API
Moving files, fixing packages