Simplified the organization (two files less)