Removed file autoloading to improve code readability