Fix file permissions
Re-organize Makefile