Restructured directory to match Textmate bundle format
merge