Cleaned up directory structure and code, added license info