Cleaned up package structure (didn't change imports yet)